Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.7] cherry-pick table filter #7

Merged

Conversation

zhangjinpeng87
Copy link
Member

Cherry pick table filter.

@huachaohuang
Copy link

LGTM

@zhangjinpeng87
Copy link
Member Author

@UncP PTAL

@@ -1063,6 +1063,14 @@ struct ReadOptions {
// Default: false
bool ignore_range_deletions;

// A callback to determine whether relevant keys for this scan exist in a
// given table based on the table's properties. The callback is passed the
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is passed the seems to be a grammar error.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That does't make sense, we just make it consistent with upstream change.

@UncP
Copy link

UncP commented Dec 1, 2017

LGTM

@siddontang
Copy link

please fix the conflict

@zhangjinpeng87 zhangjinpeng87 merged commit 7ecb1c0 into tikv:release Dec 4, 2017
@zhangjinpeng87 zhangjinpeng87 deleted the 5.7/cherry-pick-table-filter branch December 4, 2017 03:26
hx235 pushed a commit to tabokie/rocksdb that referenced this pull request Dec 27, 2023
Summary:
I must have chosen trimming before frame 8 based on assertion failures, but that trims too many frame for a general segfault. So this changes to start printing at frame 4, as in this example where I've seeded a null deref:

```
Received signal 11 (Segmentation fault)
Invoking LLDB for stack trace...
Process 873208 stopped
* thread tikv#1, name = 'db_stress', stop reason = signal SIGSTOP
    frame #0: 0x00007fb1fe8f1033 libc.so.6`__GI___wait4(pid=873478, stat_loc=0x00007fb1fb114030, options=0, usage=0x0000000000000000) at wait4.c:30:10
  thread tikv#2, name = 'rocksdb:low', stop reason = signal SIGSTOP
    frame #0: 0x00007fb1fe8972a1 libc.so.6`__GI___futex_abstimed_wait_cancelable64 at futex-internal.c:57:12
Executable module set to "/data/users/peterd/rocksdb/db_stress".
Architecture set to: x86_64-unknown-linux-gnu.
True
frame tikv#4: 0x00007fb1fe844540 libc.so.6`__restore_rt at libc_sigaction.c:13
frame tikv#5: 0x0000000000608514 db_stress`rocksdb::StressTest::InitDb(rocksdb::SharedState*) at db_stress_test_base.cc:345:18
frame tikv#6: 0x0000000000585d62 db_stress`rocksdb::RunStressTestImpl(rocksdb::SharedState*) at db_stress_driver.cc:84:17
frame tikv#7: 0x000000000058dd69 db_stress`rocksdb::RunStressTest(shared=0x00006120000001c0) at db_stress_driver.cc:266:34
frame tikv#8: 0x0000000000453b34 db_stress`rocksdb::db_stress_tool(int, char**) at db_stress_tool.cc:370:20
...
```

Pull Request resolved: facebook#12101

Test Plan: manual (see above)

Reviewed By: ajkr

Differential Revision: D51593217

Pulled By: pdillinger

fbshipit-source-id: 4a71eb8e516edbc32e682f9537bc77d073a7b4ed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants